From 4ec2a42a4ee3c3a3b405eefa85f713f612369de9 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 6 May 2004 02:42:04 +0000 Subject: [PATCH] Merge from 2.4: Wed May 5 22:20:21 2004 Matthias Clasen Merge from 2.4: * gtk/gtkiconfactory.c (icon_source_clear): Don't call g_free() on a pixbuf. (#141961, Crispin Flowerday) --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gtk/gtkiconfactory.c | 3 ++- 5 files changed, 30 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0b7dee3624..3a0d83f8d4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Wed May 5 22:20:21 2004 Matthias Clasen + + Merge from 2.4: + + * gtk/gtkiconfactory.c (icon_source_clear): Don't + call g_free() on a pixbuf. (#141961, Crispin Flowerday) + 2004-05-05 Matthias Clasen Merge from 2.4: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 0b7dee3624..3a0d83f8d4 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Wed May 5 22:20:21 2004 Matthias Clasen + + Merge from 2.4: + + * gtk/gtkiconfactory.c (icon_source_clear): Don't + call g_free() on a pixbuf. (#141961, Crispin Flowerday) + 2004-05-05 Matthias Clasen Merge from 2.4: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 0b7dee3624..3a0d83f8d4 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Wed May 5 22:20:21 2004 Matthias Clasen + + Merge from 2.4: + + * gtk/gtkiconfactory.c (icon_source_clear): Don't + call g_free() on a pixbuf. (#141961, Crispin Flowerday) + 2004-05-05 Matthias Clasen Merge from 2.4: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 0b7dee3624..3a0d83f8d4 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Wed May 5 22:20:21 2004 Matthias Clasen + + Merge from 2.4: + + * gtk/gtkiconfactory.c (icon_source_clear): Don't + call g_free() on a pixbuf. (#141961, Crispin Flowerday) + 2004-05-05 Matthias Clasen Merge from 2.4: diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c index 37fa891892..b75db0097f 100644 --- a/gtk/gtkiconfactory.c +++ b/gtk/gtkiconfactory.c @@ -2091,7 +2091,8 @@ icon_source_clear (GtkIconSource *source) case GTK_ICON_SOURCE_FILENAME: g_free (source->source.filename); source->source.filename = NULL; - g_free (source->filename_pixbuf); + if (source->filename_pixbuf) + g_object_unref (source->filename_pixbuf); source->filename_pixbuf = NULL; break; case GTK_ICON_SOURCE_PIXBUF: -- 2.30.2